Snap for 8952093 from 460e94bc49773d6e1a442fe0885e64bf3de98992 to sdk-release

Change-Id: I1f47ef70d87f135fa25d8536c5a3d38b812335c1