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

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