Unbreak abuse detection

Some part of I7166619fb2d9d836ceb61858078027269dbb90bc was overwritten in
I43a7215296b7d1e2fc334226198cd5e081e40f60

Change-Id: I1a44e9c0867f1560ecb9552eedb5c2cb558d2e66
Merge "Unbreak abuse detection"