Merge "Make HearingAid code more generic"