Reconcile with ics-mr1-release

Change-Id: I74de9b8f1c59bb309cecda20c9181c69958c296c