Snap for 7160059 from a0074221150c75be9e45d2efafc9ab3709efac00 to sc-release

Change-Id: I655f68fe5c2e1aac053cd4ee4afe511af08557b7