Merge "Removing over-active NTP & XTRA assistance downloads" into nyc-mr1-dev am: d2700049 am: a0e54db0 am: e0572e6e Change-Id: Ife463fbf629a4551c37f32264361f156b61f24dc