am 0df47ece: am d5a59aa7: am 1b2d214b: Merge "Clean up forking and cloning."

* commit '0df47ece78b2e596dde3a2369b44917842bbbd4b':
  Clean up forking and cloning.