Snap for 6533464 from 706e20fc316108a4ded94ba9793cb1487d1b38e9 to sdk-release

Change-Id: I2a109a5a2e6383d64c32e09e567485e0f46a2e71