Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev