am 16d088ec: (-s ours) set BUILD_ID, do not merge

Merge commit '16d088ec1e02d85f318b4657db91fe0145db67d3'

* commit '16d088ec1e02d85f318b4657db91fe0145db67d3':
  set BUILD_ID, do not merge