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

* commit '21eda0c31a96068540649c310850958331c258b9':
  Remove version requirements for AOSP