Snap for 6290619 from 9a077af94ced8144ec87ec758c378da9b30274fa to sdk-release

Change-Id: I580b21c9cfb9727e25765253763ea0dc7439bb2b