Snap for 6533464 from 3a29882427f9839c10017a4827646d3d56d4192c to sdk-release

Change-Id: I97a4e3eb79be36cd93451736951033f154820dd1