Merge change I343737c9 into eclair

* changes:
  Remove GAIA string