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

Change-Id: I96fdabbded98338322d321d0751afa3c9c6cc659