Merge sc-d1-dev 6958804 into master.

Change-Id: I011aa399b7359922e776028937864e32398f0d3f
BUG:171916167