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