am bfb25615: (-s ours) [DO NOT MERGE]Drop current SDK as of JOP36 #524024 from jb-mr1-release

* commit 'bfb25615b4980b73f11ae900337b75ffdbc302e6':
  [DO NOT MERGE]Drop current SDK as of JOP36 #524024 from jb-mr1-release