Merge branch 'MR1.0' of ssh://192.168.1.42:29418/T800 into MR1.0

Change-Id: I8fb67fbfea14d22b2ffe19375cdf523203f86282