Merge "remove HFA logics" am: d772ab65b4 am: 810bb29bd1 am: 59d3ee1684
am: 6b2f936ca8

Change-Id: I8952d984016d08df1817012e69196d2ae982e664