Merge sc-d1-dev 6958804 into master.

Change-Id: I77d3689893c7ff4ad21f21a831a9975e56d5dfcb
BUG:171916167