Merge "Replace StatusOr<T> with Result<T>"
am: b7f93deebc

Change-Id: Iacb46b3233b092e1578c7f20e593c89165f0d44f