Merge "Fix parsing of kernel wakelocks" into nyc-dev am: 6f0d399214
am: fea0c3af7a

* commit 'fea0c3af7abeec54f47292698e16a556f653bbc0':

Change-Id: Ie8244da32f0ca32077d98d627e3e5a967a810395