Snap for 7838477 from e3b6dc0f67b9b87bdba4ed801eef2834a57e3c07 to sc-v2-release

Change-Id: I3ba0bbeb7480b3171435e3543df256e3b4cf9e2e