Snap for 11724015 from 41be05a790e708f9b1f7841f791b3bb73b434136 to sdk-release

Change-Id: Iae553ab5e5b5176b4b280d0940868cbaba6914cd