Move advanced and hfm settings, hfm update

Change-Id: I80e0cc45d9a1b9d90a67a358104f4f42011f89a3