Snap for 7336869 from 41e1fe51504e14d2ac81d90f8900478a55d897d8 to sc-v2-release

Change-Id: I826b1cc7b7bdf972f8141a13f68678d967c4f31e