Snap for 7845934 from 52c5bf2b6f5b919415c052daef9bae4d0728419d to sc-v2-release

Change-Id: I140d73a68d69e2be1bee4fc54696102615d0d6ff