Merge "Suppress expected exception due to missing network_watchlist.xml" into pi-dev am: fcfc753a0e
am: a0bda99a49

Change-Id: I12f3d07759d15447dc902e8a721275d33febbf97