Snap for 11812660 from d3a906c412e7e1a4d55f7675904c719ca9a7adf3 to sdk-release

Change-Id: I0ca076aeeb97998b9e5e4eacc5fad3f0532a5c68