am 8392b831: Merge change 25632 into eclair

Merge commit '8392b83176f4090c9d7b9b4c90505bac1d280c79' into eclair-plus-aosp

* commit '8392b83176f4090c9d7b9b4c90505bac1d280c79':
  Set default build ID to eclair (usually this is overridden).  Please do not merge.