Merge "Add Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED" into nyc-dev