Snap for 7863714 from a59b54c545d934da1663ce462ca48e880204941a to sc-v2-release

Change-Id: Ibf9fc1c736b62ff999df4ac04336f75dc6b49b92