Merge sc-d1-dev 6958804 into master.

Change-Id: I8d8e6ba49b825104d4445bf8e629a64a70ac1fc3
BUG:171916167