Snap for 6533464 from 31331a64602f127bf2299b61f4e3d1bb67193be3 to sdk-release

Change-Id: I79a59a71e7aa43feec0d2cdaf3a2ac4c1d484ea8