Merge change 1150 into donut

* changes:
  location: Location Manager wakelock cleanup