Reconcile with ics-mr1-release

Change-Id: Ib0d0203d6720a5fe107788dd717fb574003688be