am 53ed93f3: (-s ours) Merge from jb-mr1-dev - do not merge

* commit '53ed93f3c47c454f14d1218e4b1b2cfab5308e43':
  Drop official SDK 17
  JOP40G