Merge "remove HFA logics" am: d772ab65b4
am: 810bb29bd1

Change-Id: I6e7ec010bc2f34cf47316faaaaa76ab8f998d896