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

Change-Id: I48f774cf277543c5224958520e3bd78aac776a0c