Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE]
am: 4171cdf303  -s ours

Change-Id: I2d3f4c4b11ba2a39649c7747fbe1cee1ff16f198