Merge "Add tests for verifying network availability on activity start." into oc-dev