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