Merge "Do not generate non-primary profile watchlist report" into pi-dev
am: 421ec104af

Change-Id: Ief4aa2940fec1936abf94387181f7c0edb1bfe08