Snap for 8952093 from 99f8d26e337b464108bbc51fb66083a6d2c9515e to sdk-release

Change-Id: Id107f0e8f1568ce50c9dd226a401c4ee8841f2de