[automerger skipped] Merge "Replace StatusOr<T> with Result<T>" am: b7f93deebc am: d5f920b4c5 -s ours
am: 747de6b705 -s ours
am skip reason: change_id I49bd2797106fdc91205e76222120ce98ea021ecd with SHA1 137fc81fb2 is in history

Change-Id: I3ba16ee4a5fdc1b360313215e10e278d7291378b