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

Change-Id: Iaada60775896b7e09da684fe304d4332ef940dc1