Merge "Add a wakelock timeout when downloading xtra data for GNSS." into oc-dev am: b1f7358d98
am: dca07572d9

Change-Id: I81e91999c4a289caceea2407f62ef417c4b71072