am d87c6887: Merge "Fix build numbers"

* commit 'd87c688720076c6d7b94c5ad59b9a7b4c7f9f334':
  Fix build numbers