Merge "Always use fresh NTP time for GPS" into ics-mr0