Revert "Revert "Squashed commit of GPS changes from CodeAurora""

This reverts commit b7588067bfba5a00dbaf0873b00974b2fe475656.