Integrate HFM and revisit ad blocker

Change-Id: I03c5616755b45d35dd34be2930edd3a187735465