Snap for 7160059 from 6a4d737b0415632df2c4f1c6a517e10c6fbdf14b to sc-v2-release

Change-Id: I1d21ddc171ae312ec419bc1c65d66d0de003fe02