am 7f6e1aff: (-s ours) am 262f3ff2: am 8ffe17ae: Merge "Update gps status icon to be a "high power" location icon. Move icon to right side of the screen and synchronize status with AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION." into klp-dev
* commit '7f6e1aff':