Merge sc-d1-dev 6958804 into master.

Change-Id: I8cd8a20522c16e2777589319612eceed49314ebe
BUG:171916167