Snap for 6290619 from 59deedc9c468ce8ae0f10e9c30742fd6f3ac82b7 to sdk-release

Change-Id: I7de72aeb96c6462bec04dd92a68cb5c5dde10f3a