Reconcile with ics-mr1-release

Change-Id: I35fea7fba390129cec15616718e2880bfa3b414c