Snap for 7687813 from eca2ef2d5e0506a805d928fbe139b8e968c21cc2 to sc-v2-release

Change-Id: I4f895c511156b3be6ba068222027a2ceba12cefa