Snap for 10399941 from 390028a9da88af7bb2749583491f0b37686556a7 to sdk-release

Change-Id: I98e79eb0c9600d6063bcdddad9bcd58702739d4f