Revert "Squashed commit of GPS changes from CodeAurora"

This reverts commit 496ec90c68f59e3922bcc0ffb44c7a0772c5ad6e.