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