Snap for 10399941 from 26b2b7ccf4dc6655721b1796aa6919f49bb263a2 to sdk-release

Change-Id: I392aaa7406aa4de6b52a0f61ecc8e9194244fc67