Reconcile with ics-mr1-release

Change-Id: I921ce845b1dd6ae57d50a5aef700caf9d567d34e