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