Merge "remove HFA logics"
am: d772ab65b4

Change-Id: If05e1a6730ef69e6308655c9c653b246344023ae