am bcfca488: am 415add46: Merge "Remove old fork-and-specialize API"

* commit 'bcfca4885a75686f19e4aaa97addb00f8fd43817':
  Remove old fork-and-specialize API