Merge "Merge "Don't assume host is wildcard if not provided" into rvc-dev am: a1b6280e am: d856d8e3" into rvc-d1-dev-plus-aosp