Snap for 8018982 from 6264264eb9b2d2dfa2ac7b7a8e07a231c3d2147e to sc-v2-release

Change-Id: Ieb33624220163a94cfe99eca4dc1fda1efd1cfc2