Snap for 7364021 from 9bc4795125a764b4bc60c5eae13b6820ded2e637 to sc-d1-release

Change-Id: Ie3b44b87bdd11f16f032a0d9298d3ad108e0ff97