Reconcile with ics-mr1-release

Change-Id: I543778af0009368aa57aba5e0861d981b4351e61