Snap for 8076550 from efdb92ca22a05fec182aff90e05a281f3ba3e5ff to sc-v2-release

Change-Id: Ib8c95eb0bf7d4132da7024c5947984099df41965