Snap for 12472708 from 801957341e3394b6dec07068045c855f7167eee6 to sdk-release

Change-Id: Iea9f5b252213f7ee29b4f02fcf9e4f1aa4fd43cc