Snap for 6533464 from 0cf3d2c0b7cf7aeb3e0234163eab7eb9d802ca2a to sdk-release

Change-Id: I1a2b632ab1054e7a8db17f86edfe4916822123c3