Reconcile with ics-mr1-release

Change-Id: I3c87f20abda7773ef0be32877cca8f0a1ac4f558