Merge "Add tests for the network blocked status change" am: af0de1a2e9
am: 43d8774f68

Change-Id: Id21571854cd43b724cee170ea458c9f20919c4e6