Snap for 10214594 from 2e2a114d4a1256cea0604d7ef02cd215c4d90117 to sdk-release

Change-Id: I162b849829693b83f5ef695f407137dc6d7aeb7a