Reconcile with ics-mr1-release

Change-Id: Ieb1f3cdd9a69cff091b73983f68c03cb5d26b9d7