Merge sc-d1-dev 6958804 into master.

Change-Id: I4a4f3212a7ec53b6d1e70d1e27cf2a95b1fb88ba
BUG:171916167