Reconcile with ics-mr1-release

Change-Id: I4d2578e9635a5585c499f7ffcd816c5cf6876b3f