Merge "Add extra check for NetworkWatchlistTest" am: f4130d6822
am: a09b433e06

Change-Id: I0b7babfb4b0e919136e6dd069c61f223c6039af5