Merge "Have WakeupMessage call Handler#dispatchMessage()" into nyc-mr1-dev
am: 46de5f4917

Change-Id: I5e3cbb240654287cc9299582a63bdb04a07e2ea0