Flow watchlist data tweaks

Bug: 60723
Change-Id: I27d0dbe1d30fdba646f40c2c47671cb4c07052d1
Merge "Flow watchlist data tweaks"