Merge "GPS metrics collection" into pi-dev