Merge "Fix test breakage in HidHostServiceTest"