Merge change Id43a8e08 into eclair

* changes:
  Remove GAIA string