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

Change-Id: I0dc45cd8cb5c3e824edf56b4229c7dd752f77371