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

Change-Id: Ic4859e6f70a082acfa627e7b2e409a4765e41376