Snap for 7160059 from 242f1d1c908233e16caae1edd13c6fa2f865ee72 to sc-v2-release

Change-Id: Icbfc2b5e0f9d0a9c861d6e84bedc67d95189ee51