Merge sc-d1-dev 6958804 into master.

Change-Id: I9f96b6efa03f1c15ee3bf11e219459aff13cb410
BUG:171916167