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

Change-Id: Ifb271f45a06399315f55b8fff7abd0e2a56dab8e