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

Change-Id: Ieed9f01c76f81a8eea7d71f77e641e5aaea697b9