am bd0029b0: Merge "Add more version checks."

* commit 'bd0029b08c7ead7176d60a69e758ba5993b11709':
  Add more version checks.