Snap for 8057497 from d278454744e4d0dc97707fe71760ab4ab20928b3 to sc-v2-release

Change-Id: I6d6ec4af6aa94227fb1d7887bf4c720bd68d5185