Merge sc-d1-dev 6958804 into master.

Change-Id: Ic23eb2998ca646064d3381d28b06a1df1cee46d3
BUG:171916167