Snap for 6290619 from ccabcdbb5be800b96f92a664230343ff04d3f8fd to sdk-release

Change-Id: I2e0e6306410b5edfa3d3ab76af760f4b1e8ab89d