Reconcile with ics-mr1-release

Change-Id: I482fb602082f6fb3aff4a28c3934849ac03d5168