Reconcile with ics-mr1-release

Change-Id: I8092407d2c0af09b5e32b1ca76d060dd7bab7e5e