AdBlocker 2/3

Change-Id: I4bf5f55021cf234e47cf344d0183b24b1550ca4e
credit: tsubus
Merge "AdBlocker 2/3" into lollipop