AOSP/Google Location Provider tweaks