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

Change-Id: I8ed8ebe24e18b5f32a07e26407bf30d36411dc0d