Snap for 8952093 from e67bb2d9c20b8362f2c4618846e63a234a239d16 to sdk-release

Change-Id: Ie887551365c51edc518504920368cbe65c92dd67