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

Change-Id: I0e3367d9641717676653bd54ca41d85422c5d81c