Merge "Add a new WakeupMessage class and use it in two places."