Snap for 7921329 from 48683e24395a548524580ee194fdfa662732a168 to sc-v2-release

Change-Id: I12aa37e6cca5f5a3fd9f4946318b729ccd04054a