Snap for 7588338 from 69fbdff0ed3303bcc74a93440a42063eb2df0f90 to sc-release

Change-Id: Iec0551c34dbc3e67dda3c056af551417de21ed93