Snap for 11566117 from f19a77c24e7251d1a8112433fdacc02ac5a02a72 to sdk-release

Change-Id: Ie5dcd041c870d2e2eb631f0eaef52ec0d14ab913