Merge sc-d1-dev 6958804 into master.

Change-Id: Idd08484507451f95d6f71c9408d9c7b3cf0936a4
BUG:171916167