Merge "Add extra check for NetworkWatchlistTest"
am: 790502dace

Change-Id: I196889432036b9232507f926f8bee9376ecd0636