Snap for 7721244 from cbc2313c177946f41cff1a5c6b9563b8d9aa1cb8 to sc-v2-release

Change-Id: I75d5e380af179fc8cec0dda483cc23ded1bb6e4e