Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev am: 32bd448cc1
am: 9c4561370d

Change-Id: I77194b8ef5f71f36020cf02c010d47dd07c12a93