Merge sc-d1-dev 6958804 into master.

Change-Id: I363932dd17489d508421c6fdc0945466e40596bd
BUG:171916167