Snap for 8952093 from 51d39246c4755f859b579ab5d2f4c96e7348043e to sdk-release

Change-Id: I0cb8e10a49268a8486c3d05b8eeaf2e298f2e093