am 698b08d7: (-s ours) am 8beb724d: am a262dcfc: Merge "Remove dead code related to using a non-local FIFO for message passing."

* commit '698b08d7fb84e2f95f4917d6f7dcf72a6fea585e':