Reconcile with ics-mr1-release

Change-Id: I7c50185d28ff8b3818d66b2e232e5e5507fa7902