Lets Freeze for 6!

Change-Id: Ifc67d4113827a9e02a0d0612c7b08116e955faac
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Update: Completely integrate HFM into Settings [3/4]

Change-Id: I4c5fc57c978a88b1cb113509d9b7b58c72db0ca0
merge changes from Slim kk4.4 into local branch