Merge "Skip \'network may be monitored\' if dying or locked" into nyc-dev
am: bc73347152

* commit 'bc73347152a3562a7f957a07433d64912f4acd83':
  Skip 'network may be monitored' if dying or locked

Change-Id: I8a0818074887fd20c0204098a6824ec9e9589dfa