Merge "Removing over-active NTP & XTRA assistance downloads" into nyc-mr1-dev