Merge sc-d1-dev 6958804 into master.

Change-Id: I049a30f0add938d328bb3a329ce5a2382a4b7789
BUG:171916167