Merge change 360 into donut

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