Snap for 5611628 from 8ca5e902a392a92963f86b9e9e3e3db32e626852 to sdk-release

Change-Id: I45c9f89f95ccb9e478b8a772f360819f10761881