Snap for 7038051 from d1cca2e0d24febeee09a96531e9c2ef48ad26e34 to sc-d1-release

Change-Id: Idb4d1dd116b304a7d1430637dc8df5a166a921af