Merge "Fix breakage by removing #include gps.h" into pi-dev