Reconcile with ics-mr1-release

Change-Id: Icc486a00d6c067c87364023fcf7226686dc0642a