Snap for 7107824 from 85b123995378e4abfa5a9568e13fe2c9bfbc2537 to sc-v2-release Change-Id: I4ebba318c29919d0bd3c0384c37aa4ad9d93dda2