Merge "Use GID "wakelock" to control access to kernel wakelock"