Snap for 12503729 from 7cbe91c8e4a27093abcba94a85259f3bda81e5d1 to sdk-release

Change-Id: I12dbd0392e03b2d4ca144c3d1f92738dbfeb04a7