Reconcile with ics-mr1-release

Change-Id: I5ed59dac01fe8fe14c6f5be3c5f3a1dacabe5b24