Snap for 7390572 from f3649f5e9835fb8ae9a4e60cac464e6610c0a172 to sc-v2-release

Change-Id: I52b905569ec97d2ba3a8d518ed0e614a6ec1b7f3