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

Change-Id: I29eb367316974eb68d83596202811aa79540275c