Snap for 7915781 from fc719b474aed2f28b48b589caa4b144a8d68d493 to sc-v2-release

Change-Id: I31444e81e0c3fa85d0c2154d11f98631a3d4a40c