Integrate HFM and revisit ad blocker

Change-Id: I452f3c4d970ce80cb8f40be3161d71d04053e31d