Block: $row is a stdClass, not a ResultWrapper

Change-Id: I874d2fad32099aff05868680a6194b8d0d44fb23
Merge "Block: $row is a stdClass, not a ResultWrapper"