Snap for 8952093 from 14aa962455d4270e2e2c0c0ee50ba63ccee2f100 to sdk-release

Change-Id: Iff9a9a92172cf98f311542b740d43a39dc45d56b