Snap for 7185571 from 309fb4b1e6d2fa3cf976420da14e82f590347ed3 to sc-v2-release

Change-Id: I1961e5e906d4494747f2d4fc04f74501abb6e4f3