Merge "fix: passing ResultError to Error thru operator<<" am: 3fcd831a6d am: 29949c089c
am: a2f0585ec9

Change-Id: I79f480cc095d6385a557f32bfb7cd26cc5facb6c