Snap for 7538344 from 6ea9ed5f08fbf10c2325a6f45faee12db93edbf3 to sc-v2-release

Change-Id: Iad8b0a0b0913c1142bb853c9879c81c7c4a297a3