Snap for 8782634 from ffa8801395b8eb014435265e76a4b1644cbfc00b to sdk-release

Change-Id: Ia4e0640e2d9986f0ced72b01b31401baa6694753