Snap for 6964888 from c32fb5764d33bffacaee40b01c5f6db388d61689 to sc-d1-release

Change-Id: Ia5dfffa8801033d2dd0dd01112a102e048bacf4b