Snap for 8033408 from 3de047cb320e3258d045ab3fa44c5c5f33a9a1f3 to sc-v2-release

Change-Id: I4a556faea6531279bb410e35e6ddc65cdf9fc957