Merge "Suppress expected exception due to missing network_watchlist.xml" into pi-dev