Snap for 8006359 from b52f83112da5c708bfa448ce206c85ab3674e82d to sdk-release

Change-Id: I19f392caa11189044bc5a9c69ef3e034fbb92277