Snap for 11754915 from 7b3637466893a4f07ae73ed388cb7c06e34361ba to sdk-release

Change-Id: I37b3a6b8396f1ab24243d8b0956761b2b32350a6