Snap for 7615608 from 5baaef08c79bed743af9aecf7cc45f50b84c2de7 to sc-v2-release

Change-Id: Iaa06d38ec695ddbb432e45046e4527585b5cb461