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

Change-Id: I11d2bdcbd0635510ae7a53574749404a96162773