am 86fe4e41: Merge "Do not update Out after it has a valid location."

* commit '86fe4e41720cab85e3e40c45c0436521e56b25d5':
  Do not update Out after it has a valid location.