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

Change-Id: I2153ca7f4abbc1f2689a3e39cb21ce6945685a49