Merge "Add Runnable mechanism to WakeupMessage" am: 5964b55654
am: d870cd33f5

Change-Id: I2d0f1dd85e97764159eda8239c344e95acd41ee9