Reconcile with ics-mr1-release

Change-Id: Ia054839cf72145c96864f64012bf980e146b1b1a