Reconcile with ics-mr1-release

Change-Id: I0126d92680a2624881870d7c835b3abd02cd6bab