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

Change-Id: I33256558f03d993c88520ff50d4bab915ee7ccbd