Snap for 7149879 from cf4126ebe8713885d0dae967bd2a7685d3efd3b5 to sc-v2-release

Change-Id: I8a8bc14489a94326011148a9ca26d98e394207f7