Snap for 13198286 from 3d27273d9a1f34c809d80255a5fdefaea4227f06 to sdk-release

Change-Id: Idc9bae322f7ae3bf5f2cd3bc05cd56e7be284e4f