Snap for 12743396 from 992e7ec47e7f874e36792b67d74e84a9ed8412e3 to sdk-release

Change-Id: Ie4ff1050ef60830875645a7820e844095139f2d8