Reconcile with ics-mr1-release

Change-Id: I52011206a9c079d9d099c5d11c3b9c3020d82cda