Reconcile with ics-mr1-release

Change-Id: Ibae283408ede0f3ff5a297e8d205e976455f3b95