Adblocker 2/3

Change-Id: I44570d2eb4d791963dc0ba775eee40c80347a817