Merge "Phase-2 API takes a hostname"