am 1dfe62da: Merge change Ie9e5982e into eclair

Merge commit '1dfe62da17e21b7171ca573111e356ef2bfcee77' into eclair-plus-aosp

* commit '1dfe62da17e21b7171ca573111e356ef2bfcee77':
  Remove GAIA string