Completely integrate HFM into Settings [3/3]

Change-Id: Ic0e22caf7e9bd64c8f5e0975777d80e352039f05
some fixes

Change-Id: Ifb0e358961833726a9cbcde2564a00d0c3fe01f9