[automerger skipped] Merge "Replace StatusOr<T> with Result<T>" am: b7f93dee...
[automerger skipped] Merge "Replace StatusOr<T> with Result<T>" am: b7f93dee am: d5f920b4 -s ours
am: 747de6b7 -s ours
am skip reason: change_id I49bd2797106fdc91205e76222120ce98ea021ecd with SHA1 137fc81f is in history
Change-Id: I3ba16ee4a5fdc1b360313215e10e278d7291378b