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

Change-Id: I54a33e6d30b0b502e2e886ad4dd54086a7f0c17e