Reconcile with ics-mr1-release

Change-Id: Ib05412a0777079563891bfdc8a5590a472e63364