Snap for 12472708 from dde71018e75861bfcc84c0e0d8f2c749fc531240 to sdk-release

Change-Id: I7f483a7a948750931120dfafd4c7d7a04436f484