Snap for 11566117 from 9eae345bd8c6203842eb13ebeed855086eab9034 to sdk-release

Change-Id: I7082004b6891dfcc7a4f1239daa0ca6fd2b747ab