Merge "Don't silently fail if API result fails to encode"