Merge "Fix parsing of kernel wakelocks" into nyc-dev