Merge "Revert "Revert "Remove getStatus from Return<*>."""