Snap for 7929330 from 5a76b1e0721276cff6f752d6e87204ae46a1eeb0 to sc-v2-release

Change-Id: If570ce9f949ba3f7718ff3b101e51ca0188640dd