Snap for 7213262 from b3a3562873f8530bc0352fbf8727c787cb8106e8 to sc-v2-release

Change-Id: If97aba7b7929fe6652a46fbc9a011c46325b3180