Snap for 6290619 from a4398eccb889bef19a607fd8d8c8c91a3deeede1 to sdk-release

Change-Id: I2b428faf06f1e7d3cf57fa8b04b2c02cf72e0a6a