Snap for 7932843 from d2214e58827904ad11557a15a46302211e3ff1a2 to sc-v2-release

Change-Id: I1a75b2ac98bcf132d30fbd6b241d63aca7507d54