am 16eebf82: am 01801ea8: Merge change I71c41a7c into eclair

Merge commit '16eebf82aa73c0a0092e92a336967ed2ced2310e'

* commit '16eebf82aa73c0a0092e92a336967ed2ced2310e':
  Remove GAIA string