Revert "Trimmed the branch to only the gps_common sub directory"

This reverts commit 5568a1d5764d15597970e119ccc1cdcfdefe4c02.
Rebase from 'upstream'
Trimmed the branch to only the gps_common sub directory