Snap for 8253222 from 7cc56f259693873c4234f167f3e899c4c7541ac0 to sdk-release

Change-Id: Icef5aa0f9e178728d7bf5541e06f4a5aca324784