Merge "Make wake_lock acquire/release errors explicit"