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

Change-Id: I2a63754f83346825bce28f5849fcf53794e64929