Update: Completely integrate HFM into Settings [3/4]

Change-Id: I4c5fc57c978a88b1cb113509d9b7b58c72db0ca0