Merge "Fix APICDOC HC creds"