Snap for 8952093 from 791b52309d997f2c52e29a5eb0cea4e0965bb149 to sdk-release

Change-Id: If2f67e5a6064fb2eed424f9fc70e9dc337a84483