Merge "Do not generate watchlist test report in production config" into pi-dev
am: 627596f6a5

Change-Id: Id4a5a9ba98b1d48f77190381ad90cd77f783d04d