Snap for 7449603 from a51ef571add64065836c06e5c774529d96132d8e to sc-v2-release

Change-Id: I5ae05ca77ffb59e51b6cd64da04d0329c797e923