Snap for 13235685 from bc6e5c8df8d79c5c2782b899201ebc6e7604d070 to sdk-release

Change-Id: I73cd38048b806653a3815ce3a4f38480f410c2a2