Merge "Stop converting from Location to ManagedRegister."