Merge "Properly battery blame throttled location requests" into oc-dev