Snap for 7213262 from 0cbe7794297b000727761a3e499294e30d408d91 to sc-d1-release

Change-Id: Id2f611c7308959ad97ae2b519c2591877fade85f