Snap for 7213262 from 85f89ad7f8c24ceea85c180d8af64fd01679399b to sc-d1-release

Change-Id: I5e5fe5b160b2c73d354a582911fecddbe49c41d8