Snap for 7821744 from f8e47a07bec60534e0c94fd451f407d77e9e5ff2 to sdk-release

Change-Id: I8ff1c89ed84899c01e84f908606a3ce1a5263a71