Snap for 12192341 from 0d0e30bfd324d252921aad6dd459e035a2ab2350 to sdk-release

Change-Id: I05070f82b96084f2d01423b7d2a811f1586f132f