Reconcile with ics-mr1-release

Change-Id: Iccf81d3aeba122ea7b6eee8366b3f6034e183ac6