Snap for 6533464 from 3f1e45879907c18716f59023988bc23d78a4ace7 to sdk-release

Change-Id: I882190d07ac2fc2401be3eec97babcd05b3ada23