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

Change-Id: Id5f2c4cda759053c7c2af023da806e51d04d4684