Snap for 7616100 from 5a195ac4e2ba273561f5104fefc98e0fb41a178e to sc-release

Change-Id: I0d27026918302a8d4dc70d3fb4b8dd67de77fa04