Merge "Allow error/abort for non-oneway calls."
am: 4ffbaac8e8

Change-Id: I08903b55e4abe17d17381739c7c23180100304b0