Snap for 11724015 from 32820887eb007c5374f5826117d87b09c2d4f645 to sdk-release

Change-Id: I9ff8861668971d585d572257836e3072f19e5e67