Snap for 10399941 from 202f02f4758512a6edd1ef7d31cef05bb659b026 to sdk-release

Change-Id: Ie9d800230677e24b5f03b5362a7722b5fd762b97