Snap for 7160059 from a05dec9a50dc906aeb49a98bf0cd94089d2e9bb9 to sc-v2-release

Change-Id: I8f12866a868902b63215dd812fc149283de309cf