Snap for 7422643 from a9729407b25f9e7a5f232490261dd799f437197b to sc-v2-release

Change-Id: Ie25c5146e379114c00adbdb171ef1828f59babea