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

Change-Id: I01e6be4e2a01f613ae6676dbc451f1e1fc1898c0