Snap for 6290619 from 2d9dbc9f306462644b502c8e1f4d564659bf0a9c to sdk-release

Change-Id: Ia0a1208d30596714ffabcedc1ae021891b4d6ded