am e18dddfc: am dae9c8c3: (-s ours) [DO NOT MERGE] Drop current SDK as of build JOP31 #520834 from jb-mr1-release.

* commit 'e18dddfc411cd96378e58f2cb1c4c451e2d045cf':
  [DO NOT MERGE] Drop current SDK as of build JOP31 #520834 from jb-mr1-release.