use ResultWrapper directly

Change-Id: I4f84870dfd9ab02211f96c536c40126d14bf32e6
Merge "use ResultWrapper directly"