Merge "[CDM] Bypass location setting when scanning for devices"