Snap for 7464306 from e7cf240e0ceed4c3248eb4b9883936df9cf8d444 to sc-v2-release

Change-Id: I583052160329f9d025d7ce9b4dcfd798dd68b5fe