Snap for 6290619 from ecc2406087855bedf2d8e8e528ab0b2b4e6c7298 to sdk-release

Change-Id: I2da4f1413e032915b0ef70f106670cb0177c4cf0