am 01801ea8: Merge change I71c41a7c into eclair

Merge commit '01801ea8ebfde46969dbc562ffbaecb09f015cd7' into eclair-plus-aosp

* commit '01801ea8ebfde46969dbc562ffbaecb09f015cd7':
  Remove GAIA string