am 2072c465: Merge "Stop converting from Location to ManagedRegister."

* commit '2072c465cfff077da257bdf14f1f1b2690c946c8':
  Stop converting from Location to ManagedRegister.