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

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