am 33b8ce1b: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '33b8ce1bfd7f8e70e28859951cc4fc48c31d671a':
  Drop official SDK 17
  JOP40G