Snap for 8952093 from 9d2c6f4cd23f58f9fc15d813c366f9b917cfd837 to sdk-release

Change-Id: I06a1654657890a6643030bc6eeaa2a11f5ab3ba2