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

Change-Id: I9d1f13ebedfd0ff91b0c298d92c83ac8bfa884ae