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

* commit 'ee98d0ed53aeffac2b1d1be2b24bb78f282af0b2':
  Drop official SDK 17
  JOP40G