am 791bf17d: Merge "Revert "Fix build numbers""

* commit '791bf17db07d1d6d75da704d8cd616c508e4565d':
  Revert "Fix build numbers"