Reconcile with ics-mr1-release

Change-Id: I709943028122c8f3a72594ccaef4e3a650375749