Merge sc-d1-dev 6958804 into master.

Change-Id: Iefe485ba03d2a52ef14c772f9663077dfcdbed2e
BUG:171916167