Snap for 11962796 from a797171ee1ebb83715763c5d97937d57d29eded4 to sdk-release

Change-Id: I95d4d19364b37f4534e9236409360dbace104367