Snap for 6290619 from 7890ecd4bc418a422f02c0ab32406049b9117707 to sdk-release

Change-Id: I2b6b7d8ae30bedc4b15914432719cb3fb3bdb0cd