Snap for 11598262 from e4dd1b7cfb3bebcadc79e11022f10f31332e5206 to sdk-release

Change-Id: I3977339465c2a4e0b80cc3cee2c67fb53cca2609