Snap for 12349386 from 971fc76cd163dc8016aab479988e464de65d8db3 to sdk-release

Change-Id: I0cfaf9ebc7ad93709357c5209fd377a5d4dd353b