Snap for 7537202 from a89e4e03ed794b449484390360e9b2773d2305b0 to sc-v2-release

Change-Id: I1a55396e677ea1bac9f72ab79d8f79707576ddef