am f64e08b5: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

* commit 'f64e08b51f35689d1c8d6bfa4fa7606f7ea8e90c':
  Drop official release of SDK 18.
  Drop official release of SDK 18.