Merge sc-d1-dev 6958804 into master. Change-Id: I50c222e1491f3144ae3587fc0e93bd4a6bc22916 BUG:171916167