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

Change-Id: I9d54c3990bd361a67dfe82a10ec0404185c7e930