Merge commit 'ff74e22b59f8157580953fcd69e3c32aa8f68eb2'

* commit 'ff74e22b59f8157580953fcd69e3c32aa8f68eb2':
  Corrected buffer overflow when parsing /proc/wakelocks