AdBlocker 3/3

Change-Id: I19df2d8617bd9d10833348da59c20eeb9ac816e8
Merge "AdBlocker 3/3" into lollipop