am c49a37d6: am 0e3b339b: (-s ours) am 2fbae482: am c672cb07: Merge "Include the error code if GetPipeProperties fails."

* commit 'c49a37d69c9bc68603dd5d23581ad4891254089e':