Merge "Move to Global.NETSTATS and Global.NTP constants." into jb-mr1-dev