Merge "Update DPM.getWifiMacAddress to take admin component as argument." into nyc-dev