Snap for 7160059 from 5948a3ee3be44c312f11fb2acc617cce94e95582 to sc-v2-release

Change-Id: I0ba4b879d5ebe8351fcd37b11f21c2b9a854d5d3