Snap for 5234541 from bfee0199275cbd4fc53b01a019828193b88bf85a to sdk-release

Change-Id: I630d97bef3c868e48ad6dadbd5b3a9e818be0863