Merge change 482 into donut

* changes:
  location: Location Manager wakelock cleanup, phase 2