Snap for 6533464 from 31e8f0f967ae5e0f1d4b2f0a8d6206e676849ed3 to sdk-release

Change-Id: Ib8d9d516b248951793b66c68df13c30be2f2eebd