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

Change-Id: Ife463fbf629a4551c37f32264361f156b61f24dc