Merge "Fix OkOrFail<status_t> conversion ambiguities"