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

Change-Id: I98d281c9867116e846ba7e7c2feb076be9dca4a8