Reconcile with ics-mr1-release

Change-Id: I4a7bc2ad77faabb4a173f8486839861b1cc68f20