Snap for 4499105 from 1e67697ea59d01f495b31a0d44ec72979e35dd10 to sdk-release Change-Id: I8e6aa53fa7e9ad4c63093a10e0f389dc80fc5785