Revert "Squashed commit of GPS changes from CodeAurora"

This reverts commit d19d3ca7465c0d924f89da68c8267e78ea7dfcb6.