Reconcile with ics-mr1-release

Change-Id: Iaa5f9ff52792e1eff28cf9591a5efca18ac165e3