Revert "Squashed commit of GPS changes from CodeAurora"

This reverts commit 0df25462354823ee7274785453cc5ec65859bd9c.