Merge "Trim whitespace in kernel wakelock name."