am e189fb46: (-s ours) Reconcile with stage-aosp-jb-release - do not merge

* commit 'e189fb463b42cb3fd59ffe901c1f2a0bceee827b':
  Remove version requirements for AOSP