Merge "Make 2-part PermissionHostTests more robust"