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

Change-Id: I98a50fffce307bf131900e97ae52388ffe96d2d2