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

Change-Id: Ifc333646610580363acf8432eb25a78aa876fc25