Merge "Make sure network tests pass with airplane mode on" into oc-mr1-dev am: d35b6a7c26
am: 61d0fd0e70

Change-Id: I42d0157d6d3d7371cb2b9fa5d18e1d3deacf2b6e