Merge commit '5fa153302c1c7f179bfd6ddd301e7526b8c06de5' * commit '5fa153302c1c7f179bfd6ddd301e7526b8c06de5': location: Location Manager wakelock cleanup, phase 2
Merge commit '5fa153302c1c7f179bfd6ddd301e7526b8c06de5' * commit '5fa153302c1c7f179bfd6ddd301e7526b8c06de5': location: Location Manager wakelock cleanup, phase 2