Reconcile with ics-mr1-release

Change-Id: I7d6cd74bf255c517d04c5900a38145571297f66d