Merge "Properly battery blame throttled location requests" into oc-dev
am: 68e341934b

Change-Id: Iad757080d2aafc738171e9b04d03581474a63142