Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev