Reconcile with ics-mr1-release

Change-Id: Icc7a42fdfcf2d649892e186a98386e985c17a212