Snap for 7380537 from 4e760601d532dafdc1949a551216d8a3d036f92b to sc-release

Change-Id: Ia181e7851bc8fcb0d9295220a08b9f24089eaf88