Snap for 7618979 from 54ecd83b7ea8ef407669498875eec3bfe4c270d8 to sc-v2-release

Change-Id: I41f81bf9790b04b0f11882985615d640f7270e3d