Snap for 7560355 from b68f4cdb0b9fa8ac65721d7027ce4ab51217f234 to sc-release

Change-Id: Id1552ff16d966d42dba8075462c858dbddc753c3