Merge "Eleven: Remove wakelock" into cm-13.0