Snap for 7336869 from e4746bb624536eebd4243a7e235f32049df275aa to sc-v2-release

Change-Id: I96255904310b1a9a5b6e61c49b25fe9e28b46ed1