Snap for 7725932 from f5b69c6e64f3f60961cf4930a7d73576ae17ac9c to sc-v2-release

Change-Id: I8f47f831a6a4b5372cbe1706729fe2f5fac9b593