Snap for 7348217 from 394a97f19e6dac1feb65d145ea3acadd9c546058 to sc-v2-release

Change-Id: I3f37a5349b6c0e4b76f0e221cdeeab441d579504