Snap for 7194211 from 2bc39b8424d00734d38ba5e1ae16c5d8b9374bf6 to sc-v2-release

Change-Id: Icf0b2f75e3ef76477ee3a2366f3cbf6c3c27048c