Merge change 25632 into eclair

* changes:
  Set default build ID to eclair (usually this is overridden).  Please do not merge.