Snap for 6290619 from e7c9b74790a10ef58f165b32d0755831a8d93e32 to sdk-release

Change-Id: I639f2e7de3afebb4d179f10cf72f5c5e26e682d8