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

Change-Id: I1ecf54edcd43f05156465c6130e2629894ffabd4