Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE] am: 4171cdf303  -s ours am: 8b8bef622a  -s ours am: 36f0dc6271
am: 42a5b34196  -s ours

Change-Id: Idfcd5d0a793334be09109b009a40c73a0f3777db