am 22c22cf7: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '22c22cf7e0ae42b6c4fa585341459d9aa3b0c4be':
  Drop official SDK 17
  JOP40G