Merge sc-d1-dev 6958804 into master.

Change-Id: Id1fbc9ec0925959dde80bd4c7066d4b3207b973b
BUG:171916167