Merge "@hide DPM global proxy settings" into honeycomb