Snap for 11962796 from 364e90e5448a4513a73212494da114887645283a to sdk-release

Change-Id: Ia337a91af88ef47036326960e5b3c2d9b46a8847