am e42cf749: am 1dfe62da: Merge change Ie9e5982e into eclair

Merge commit 'e42cf749a9b59562d481d828aa207cb39e2bd670'

* commit 'e42cf749a9b59562d481d828aa207cb39e2bd670':
  Remove GAIA string