Snap for 11897273 from 172d8824beec46dc8a9754713f1852f26bc98342 to sdk-release

Change-Id: I3b9720e79d71b753f8cf965aa8873ef7b64e1300