Reconcile with ics-mr1-release

Change-Id: I048224e21d27e5dd655110551ce2c099882991fa