Removing over-active NTP & XTRA assistance downloads
am: 0d6e54e246

Change-Id: I6d6a151fb7bb13ddabed10aa33f20aec8cefe8a8