Merge "Avoid NPEs when WifiNetworkAgent undefined." into oc-mr1-dev