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

Change-Id: Id8c7b35e14f2b46bf999f1a4575b46176e2a0411