Snap for 7314842 from 0fd3f6ac2e67f94316934acc63b7ebd55fee1a5d to sc-release

Change-Id: Ic8ac0543c9be74866fbebccde1131ff8e9175ace