Snap for 10399941 from a21a42e20ecc4e9d25ae71d9343b73e679cc81ad to sdk-release

Change-Id: Ib77b46a9900d2b6f07dc6efbf6c5d070048ebdff