Snap for 6386567 from 62bfbf42ed740790f931c2ed8bd3afd856df88f6 to sc-release

Change-Id: I5ad4c9d364c15190cc6bd583b0aa8b13398362c0