Snap for 12779445 from d2656e6a4afea7fb25a8c466275479cbdf77d179 to sdk-release

Change-Id: Ibc2ba458ab65ea709b11f554753e229d7408a27e