am dba01032: am bd0029b0: Merge "Add more version checks."

* commit 'dba01032b2766567d676a6b9b7ebb044d897a0ef':
  Add more version checks.