Snap for 11871564 from f7cbcd30d53b96e4855c244b25c1ad57eaeb742a to sdk-release

Change-Id: I99a4530eea0816c2f629b6a20d4a0a919b981393