am 11fd02f6: Merge "Update the API version checks." into jb-dev

* commit '11fd02f63acba18a1b03351b595490597136fc6a':
  Update the API version checks.