Reconcile with ics-mr1-release

Change-Id: Ibff0a60a4654253950e08e68cafddfe7c9219734