Snap for 11871564 from a2f3430b0a2c8b683ad1bd59f36af81d24c5ee16 to sdk-release

Change-Id: I7253825e5dd1e271a3f6b6e7bd766d5b6636bf76