Merge \\"QS Edit: Fix auto-selecting add location\\" into nyc-dev am: dd65ee628f
am: ad032e7e39

Change-Id: Icf77b794e3989cb16956974a2ac553014d5df6d4