Snap for 11566117 from 7b47743dbace92ff42a24286e0d122978f2f4c46 to sdk-release

Change-Id: I47c1c8bc1b33716e26e0f0811d5ca0c470be6b82