Merge \"Make CotentResolver#openInputStream handle errors from reliable pipes.\" into nyc-dev
am: ac3fe8fffe

Change-Id: Ia2caacf5d322b807d29f51bde10b7866023b5de1