Snap for 7402811 from 6e061e54e6ec6e3b05b8c6dee60b5a667c27281f to sc-release

Change-Id: I135b80efb95f8f239ddf16edca439c3ca44e8de4