Revert "Squashed commit of GPS changes from CodeAurora"

This reverts commit 32679c2cbbcfe425ed43aca4fd78c92e1764b7df.