Snap for 6533464 from e95efe3d1176cf46e6f341ac1d0d91246a68fdb6 to sdk-release

Change-Id: I515437f804d9045602f8ff9ed46e4ffe771377ae