Merge "HFPClient: Support HF Indicators"